From 12981692a6dbf6468357eefb303c4175cdfb4396 Mon Sep 17 00:00:00 2001
From: Johan Dahlin <jdahlin@async.com.br>
Date: Mon, 2 Jul 2007 00:52:27 +0000
Subject: [PATCH] Improve GtkBuilder DTD, remove treemodel section, add more
 information

2007-07-01  Johan Dahlin  <jdahlin@async.com.br>

        * gtk/tmpl/gtkbuilder.sgml:
        * gtk/tmpl/gtkexpander.sgml:
        * gtk/tmpl/gtkframe.sgml:
        * gtk/tmpl/gtknotebook.sgml:
        * gtk/tmpl/gtktreemodel.sgml: Improve GtkBuilder DTD,
        remove treemodel section, add more information about
        container subclasses child attributes. #452954


svn path=/trunk/; revision=18334
---
 docs/reference/ChangeLog                  | 10 ++++++++++
 docs/reference/gtk/tmpl/gtkbuilder.sgml   |  5 +++--
 docs/reference/gtk/tmpl/gtkexpander.sgml  |  2 ++
 docs/reference/gtk/tmpl/gtkframe.sgml     |  2 ++
 docs/reference/gtk/tmpl/gtknotebook.sgml  |  4 +++-
 docs/reference/gtk/tmpl/gtktreemodel.sgml | 21 ---------------------
 6 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 031c53d199..07f9fc359f 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,13 @@
+2007-07-01  Johan Dahlin  <jdahlin@async.com.br>
+
+	* gtk/tmpl/gtkbuilder.sgml:
+	* gtk/tmpl/gtkexpander.sgml:
+	* gtk/tmpl/gtkframe.sgml:
+	* gtk/tmpl/gtknotebook.sgml:
+	* gtk/tmpl/gtktreemodel.sgml: Improve GtkBuilder DTD,
+	remove treemodel section, add more information about
+	container subclasses child attributes. #452954
+
 2007-07-01  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/tmpl/*.sgml: Document GtkBuilder ui definitions.
diff --git a/docs/reference/gtk/tmpl/gtkbuilder.sgml b/docs/reference/gtk/tmpl/gtkbuilder.sgml
index 6050b877f9..462400f14f 100644
--- a/docs/reference/gtk/tmpl/gtkbuilder.sgml
+++ b/docs/reference/gtk/tmpl/gtkbuilder.sgml
@@ -44,15 +44,16 @@ which are more limited in scope.
 <!ELEMENT child     (object|ANY*) >
 
 <!ATTLIST interface  domain         #IMPLIED >
-<!ATTLIST object     class          #REQUIRED
+<!ATTLIST object     id             #REQUIRED
+                     class          #IMPLIED
                      type-func      #IMPLIED
-                     id             #IMPLIED
                      constructor    #IMPLIED >
 <!ATTLIST property   name           #REQUIRED
                      translatable   #IMPLIED >
 <!ATTLIST signal     name           #REQUIRED
                      handler        #REQUIRED
                      after          #IMPLIED
+                     swapped        #IMPLIED
                      object         #IMPLIED >
 <!ATTLIST child      type           #IMPLIED
                      internal-child #IMPLIED >
diff --git a/docs/reference/gtk/tmpl/gtkexpander.sgml b/docs/reference/gtk/tmpl/gtkexpander.sgml
index 37482eb787..4a62060257 100644
--- a/docs/reference/gtk/tmpl/gtkexpander.sgml
+++ b/docs/reference/gtk/tmpl/gtkexpander.sgml
@@ -63,6 +63,8 @@ expander_callback (GObject    *object,
 The GtkExpander implementation of the GtkBuildable interface 
 supports placing a child in the label position by specifying
 "label" as the "type" attribute of a &lt;child&gt; element.
+A normal content child can be specified without specifying 
+a &lt;child&gt; type attribute.
 </para>
 <example>
 <title>A UI definition fragment with GtkExpander</title>
diff --git a/docs/reference/gtk/tmpl/gtkframe.sgml b/docs/reference/gtk/tmpl/gtkframe.sgml
index 8f2bb4f011..3fcbc2b125 100644
--- a/docs/reference/gtk/tmpl/gtkframe.sgml
+++ b/docs/reference/gtk/tmpl/gtkframe.sgml
@@ -19,6 +19,8 @@ label can be controlled with gtk_frame_set_label_align().
 The GtkFrame implementation of the GtkBuildable interface
 supports placing a child in the label position by specifying
 "label" as the "type" attribute of a &lt;child&gt; element.
+A normal content child can be specified without specifying 
+a &lt;child&gt; type attribute.
 </para> 
 <example>
 <title>A UI definition fragment with GtkFrame</title>
diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml
index ba0ad64d6a..d50827b8de 100644
--- a/docs/reference/gtk/tmpl/gtknotebook.sgml
+++ b/docs/reference/gtk/tmpl/gtknotebook.sgml
@@ -24,8 +24,10 @@ will be a popup menu allowing the users to switch pages.
 <para>
 The GtkNoteboopk implementation of the GtkBuildable interface
 supports placing children into tabs by specifying "tab" as the
-"type" attribbute of a &lt;child&gt; element. Note that the content
+"type" attribute of a &lt;child&gt; element. Note that the content
 of the tab must be created before the tab can be filled.
+A tab child can be specified without specifying a &lt;child&gt; 
+type attribute.
 </para>
 <example>
 <title>A UI definition fragment with GtkNotebook</title>
diff --git a/docs/reference/gtk/tmpl/gtktreemodel.sgml b/docs/reference/gtk/tmpl/gtktreemodel.sgml
index 8b6c7408ca..3bd3dfcc22 100644
--- a/docs/reference/gtk/tmpl/gtktreemodel.sgml
+++ b/docs/reference/gtk/tmpl/gtktreemodel.sgml
@@ -188,27 +188,6 @@ enum
 </example>
 </para>
 
-<refsect2 id="GtkTreeModel-BUILDER-UI">
-<title>GtkTreeModel as GtkBuildable</title>
-<para>
-The GtkTreeStore implementation of the GtkBuildable interface allows
-to specify the model columns with a &lt;columns&gt; element that may
-contain multiple &lt;column&gt; elements, each specifying one model
-column. The "type" attribute specifies the data type for the column.
-</para>
-<example>
-<title>A UI definition fragment with GtkTreeStore</title>
-<programlisting><![CDATA[
-<object class="GtkTreeStore">
-  <columns>
-    <column type="gchararray"/>
-    <column type="guint"/>
-  </columns>
-</object>
-]]></programlisting>
-</example>
-</refsect2>
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 #GtkTreeView, #GtkTreeStore, #GtkListStore, <link linkend="gtk-GtkTreeView-drag-and-drop">GtkTreeDnd</link>, #GtkTreeSortable
-- 
2.30.2